Auto merge of #2050 - gkoz:build_cfgs, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 12 Oct 2015 02:00:27 +0000 (02:00 +0000)
committerbors <bors@rust-lang.org>
Mon, 12 Oct 2015 02:00:27 +0000 (02:00 +0000)
Fixes #1980


Trivial merge